More ambiguity handling (identifier[] mostly)