Re: Proposed minor cleanups