The second commit is purely aesthetic, for the first ask cduclos.