More structure tweaking.
:q