Structural tweaks.