ChurnController/Msg: Cleanup, use correct types now