Handle callable state_handlers better