Major refactor of CLAVIN-NERD to work with CLAVIN v1.0.x; also simplified, etc.