Merge "Assorted minor cleanups" into sc-dev