Adapted to the latest file handler changes.