Added -where: method accepting raw NSPredicate, minor cleanup