Other than that, I think this looks good now. We'll see if @Carreau has any input on the shortcut differences, otherwise we'll merge tomorrow.