Some additional code cleanup from conversion from System.Type as in previous checkin