Small changes recommended by Android Studio tools.