Done and done. Committing now. We'll see in a few hours if it's good to merge. :)