Minor cleanups by commiter. (source commit 43ff10204b1d9b76f6d5afc5252fb09480d5ffc5 but expected to be rebased later, don't worry if you fail to find it)