some cleanups in generating polymorphic... (and related) section