Move parsing of check function into StateChangeWatcher