Tidy and use github-available shorthand-position