Shift annex B features to the bottom

To save on maintenance (and to produce a cleaner diff), this is done
programmatically.