Convert + suffixes to new system.

Milestone! This completes both v1 of +,* rules, and along with it, the
first part of the new base grammar syntax. w00t