Fix more VTK 6.1 related issues.

Some of these are silly fixes that will be fixed later but for now the
goal is to get the test suite passing and the examples running.