Moved some more type proclamations.
Removed some type proclamations that exist in better versions elsewhere.