Further work on making serialization fully annotation-configurable