A bit of cleanup for #152