Slight cleanup of ClassBinding