Now that cleanup is handled automatically, we can use 'return' more
often.
Signed-off-by: NJán Tomko <jtomko@redhat.com>