Further streamline things.