Improve representation of Constants