Cleanup of names/argument, no functional changes.