It much be cleaner to implement this as `Session withCatalog(String catalog)` and `Session withSchema(String schema)` instance methods on Session.