DTK rewrite: minor cleanup.