A few small fixed to normalize weighting expressions.