Sorry! The merge conflict sort of shuffled everything together, making it really hard to tell what the intended order was. I'll sort them back out in a bit.