Performance optimisations and cleanups

Assuming this passes all the tests, would you please be able to confirm performance increase on your machine? There should be some more wins to come in a separate PR :-)

All up there's a 20% decrease in mesh time so far from the last version.

Cheers!