Extract compstate used to an argument.
Create a dummy compstate & modify it to be current.

This way, things like the current and next match values will actually
do something, rather than being no-ops. While still only a very basic
check, this at least now catches some issues.