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

structure M = struct end

fun f (x : $M.r) : $([A = int] ++ M.r) = x