feature #1977: Minor cosmetics