Revert faulty include optimisation
Fix braino
Minor tidy up in model serialiser meta-class
Simplify MetaSerialiser