PR #157: Make controls sparser and cheaper to run