Separate out function returns from "other" branches