I can fix that, but was trying to do only one thing in this pull request (not a general QA cleanup!)