Some further design tweaks.