Fix: Updates to PR #650

That's fine.  I'll change it in my nesting prototype but that may get rejected by @jzaefferer anyway. :wink: