More functions.

The remaining functions/macros have been renamed.