I'm in favour of the 2-part solution.  Clean and tidy.