Minor FirebaseUtils refactor