core: ImagesHandler cleanup: unwrap else clauses

Unwrapped useless else clauses where the if clause does not terminate
normally (breaks, returns, etc.).

Change-Id: I0d1a9ad5c01471c217973cd0a6907023564d841d
Signed-off-by: Allon Mureinik <amureini@redhat.com>