Refactoring to prepare for external shortcuts

This change is meant to have no user-visible effects

Change-Id: Idf3a6d892ba84307a887785725aa072bd28c59b6
21 files changed