This simplifies some things, and hopefully won't come back to bite me.
Signed-off-by: NBen Skeggs <bskeggs@redhat.com>