Be more careful about reference parsing