Clean up init state of mcal::gpt. Also improve 2-part data manipulation templates.