I guess these could be kept at `<right>130</right>` ?

I'll be rebasing this into my PR, so can change then if you agree.