CLI: replace explicit listing of special tags with generic code