Also, relaxed a rule for dot notation (and unrelaxed it in src).