Fix some of the fallout from having rxgen-fabricated prototypes.