Minor reworking of code for . in formulas