There are still lots of vestigial keywords. We should get this as close to a fixed-set for good as we can.