Since the button helpers don't get picked up by the regex in the last
commit, I've had to fix these manually