Add back conditional assignments.
Improve documentation.