These macros just obscure what's going on.  Adopt the convention of the
client-side code.
Signed-off-by: NJ. Bruce Fields <bfields@redhat.com>