There's more stuff that can be shared in the constructor, will be merged
together again later.
Signed-off-by: NBen Skeggs <bskeggs@redhat.com>