osmorc: borrowed class replaced by delegation
Cleanup (too complex method split)