Merge "Small cleanups around indexOfChild usage."