Remove an obsolete #include.
General cleanup.
Merge branch '20141021-gzio-refactoring' into markj-develop