You could also pass around a special `bool hadModifier` param. Not sure which is better.