refactor toNiceIdent'ed outputs and avoid variable collisions
6 files changed