Small tidy up for #1981.