Rework namespace display in macroexpansion in a more consistent manner

This is part of the solution for https://github.com/clojure-emacs/cider/pull/705