Update generated state declaration to use short-dec form