More use strict fixes for lint.
Late night commit.