1: drop stray ShortForm attributes 2: drop ShortForm attribute While there shouldn't be any functional dependency, I can't exclude there's some contextual one with previously submitted but not yet approved/committed patches. Jan