lint: switch away from some default arg syntax because jshint not supporting it right yet :/ (and remove some unused vars)