Reorder GetType() & GetBaseType() functions in headers for consistency.