Refactored image_fu helper to only use geometry when not nil.