Right, I'll remove the two-liners (though I personally prefer the code to be compact).