If we encounter this problem again it's probably worth extracting this modifier addition to a helper function.