Following "no nested funcdefns" this can be muuuch simpler.