Fix ExtractScalarPrefix, need to look ahead after dollar