V4annotation puns

Forward port of less-splody annotation puns .