cleanups related to #637
Merge branch 'master' of github.com:PDAL/PDAL