Reduce dependencies and expectations.