Code-style cleanup for commit 84e39709fd. #4477