Slightly reorganized DSDL parser