[MERGE] Fix out-of-date error, refactor slightly

[Vincent Ladeuil]

>>>>> "aaron" == Aaron Bentley <aaron at aaronbentley.com> writes:

    aaron> Aaron Bentley has voted approve.
    aaron> Status is now: Semi-approved
    aaron> Comment:
    aaron> Doh.  Not a Bazaar merge request.  (But cute how BB was able to
    aaron> use the target branch to retrieve the needed revisions, eh?)

LOL. 

Please put a warning before such comments, if I had been
drinking coffee my keyboard would be a mess :)

        Vincent