Stuff I didn't realise VS missed.

See previous posting.