Remove dependency on stdlib4