Better separation of powers.

Signed-off-by: Peter Jones <pjones@redhat.com>