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