Moved type proclamations to more specific location.