My latest D6 bodge -- now fixed properly.