Further CSL tweaks.

Based on Stuart's feedback on [76588424](https://www.pivotaltracker.com/story/show/76588424).