Deal with nesting a bit better.