Merge "Small refactor."