Cleaned up various queries based on latest Titan Gremlin support.

All integration tests pass.