This was previously done as part of #1326, but it modified generated code without fixing the root issue in neon.spec.