Actually on second thought what you did is fine (or even better than my suggestion). Ignore that suggestion (though I have one more minor thing below)