This lets us drop a couple old dependencies, which is nice.