Fig flocker changestate yaml 796

Fixes #796
Doesn't note that it can return `None`.