Minor cleanup for #29