Minor cleanup for #52 fix