While we're here, let's kill off a couple of the read-side macros.

Leaving the more complicated ones alone for now.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>