Small random API change and code cleanup.