Clean up more polymorphic undefined's