Improve ctag support for constants