More work on annotations, plus widespread fixes. Removed unnecess-
ary type parameters from some controller mixins.