First go at immediate add/sub improvements.

Some cases handled OK, but others are still poor.
Add/sub improvements.

Improve implementation for multi-byte add/sub (at expansion time)
a little.