Agreed, thanks for cleaning this up in `dev`! :)