Less dependence on changing third-party modules