Various minor amendments and tidy-up (including DCP 179).