Cleaned up new kv-based class layout for compilation.