Fix an error message. refs #2354

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Remove a superfluous TODO.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>