`riff_state` expansion

[darrylabbate]

This is a necessary precursor to implementing various other features/fixes/cleanups

• 2

• 8

• 11

• 18

• 27

• 37

• 43

• 62

• 64