annotation order enhancements

Added annotations should be added as the last element before the first modifier. When an annotation is promoted from marker to single-value, to "normal" type, it should stay in the same position.