Shelled out a bit more serialisation/reflection code.