Minor optimizings (elseif)