     ///
     /// - parameter block: A block that accesses the database.
     /// - throws: The error thrown by the block.
-    public func inDatabase<R>(block: (db: Database) throws -> R) rethrows -> R {
+    public func inDatabase<T>(block: (db: Database) throws -> T) rethrows -> T {
         return try inQueue {
             try block(db: self.database)
         }

        database.databaseQueueID = databaseQueueID
    }
    
    private func inQueue<R>(block: () throws -> R) rethrows -> R {
        // IMPLEMENTATION NOTE
        //
        // DatabaseQueue.inDatabase() and DatabaseQueue.inTransaction() are not

    /// Synchronously executes a block in the database queue, wrapped inside a
    /// transaction.
    ///
    /// If the block throws an error, the transaction is rollbacked and the
    /// error is rethrown.
    ///
    ///     try dbQueue.inTransaction { db in
    ///         db.execute(...)
