Accomodate feedback from spotify/scalegrease#10