Smarter handling of nullary (i.e. no params) defines. Old is good.