Some minor changes that make the code more similar to what will
be done later for the related bug bgo#746440.