rewrite function return value handling to use a match statement

[sunshowers]

This avoids a bunch of return statements and makes it clear that each branch actually returns.