Tighten up modifier syntax