Expand related first-pass cleanups