In the pph file, save and restore DECL_INITIAL instead of just