Extend `solve_proper` to better handle HO functions

See the report here: iris#249 (closed)

I ran into a problem that's related in @dfrumin's ReLoC reloc@3266aca9