Various wee clean-ups.