eliminate non-macro uses of println