Merge "init: turn keychords into a standalone class"