Removing a couple of type aliases. They're no longer pulling their weight.