Two small design level changes.