Design tweaks.

This addresses one of the design issues.