Tidied after template rewrite.

SDUX-74