Put the state-token argument on fill, done, adjust on the RHS

This is so that the functions will inline when
applied to their normal (non-state-token) aguments.

I forget why I did this, but it seems like the right thing anyway.