Merge "Improve API signature."