Re: Minor before/after-change cleanup