Additional cleanup for #1090