multi: Small code tidy up to avoid hard return