A bit of cleanup for #161