#2383: minor cleanup after merge