Tidy up declaration macros.

Implement jd_nXX() family of constructors.