Updates to conform to CEP17 changes in core

Companion to cyclus/cyclus#565.  Changes are fairly straight forward.