Fix inconsistencies and duplicate accelerators.

Some of these spotted using my consistency-check branch, some not.