We no longer need a few of these special cases.
Signed-off-by: NJ. Bruce Fields <bfields@redhat.com>