Made a few types more polymorphic.