Adapt parser to emit stable shapes