Rename makeDeclName() and add a variant which computes the String name directly rather than constructing a JCExpression and then calling toString() on it, which was pretty disgusting. Generally tidy up the API before I try to change stuff for #1596
Fix #1598
Issue #1598: Fix tests