Improve output for constants, variables and classes.