Improve "very" recursive support (Fixes GH-54)