Major refactoring of feature and attribute modifiers to feature and
attribute annotations.