Some cleanup for #26