Some structural tweaks.

Nothing interesting here.