Remove last mentions of withBuffer0.