Avoid elseif chains - early return already avoids this