Doc changes mostly.

Also, deleted two macros that aren't too useful.