Further cleanup for #384