Issue #449 pointed out that there were some files that were
missed in 6f514864.  This
fixes that.

Closes #449
Closes #450