WIP: make jshint happy...