Fix for Scrutiznier inspection around returns used inside switch statements