Update these things. I suspect I'll have a merge conflict with myself soon...
Seems clean here...
Fixed this too.