first round of UMBC merges; all these changes are inert no-ops