I still feel that this switch statement would be a lot more readable with descriptive variables for the return values - the inline comments interfere with the whitespace that would normally help to differentiate the blocks of the statement, and it is not possible to look down the left-hand columns to get an overview of what cases are being handled or to find a specific case.

This may be something on which to make a stylistic choice as a team.