Finally resolving #5 - constants simplify themselves.