Refactor channel subscriber policy spec messages