Tweaks/fixes, added acceptance test for recursively deep usage.