TODO fixes, cursors for parsers/serializers descriptions