6.7: always return a scalar value from match().
        update Evented::Database.
        other random changes.