Generate macro names without periods in them.
Get the expression type right for +=.
Merge branch '1.4-stable'