Merge "Clean up Handle usage."