Identify more local definitions as functions that should be lifted to the top level, which has synergistic effects on inlining later

fun main [r] (r : $([A = int] ++ ([B = float] ++ r))) : $([A = float] ++ ([B = int] ++ r)) = r