Cleaner protection of state mutators

Signed-off-by: Casey Dahlin <cdahlin@redhat.com>