Apparently I suck at branching, these lesson 2 changes are already in master. I think my cherry-pick got confused.