This hunk still makes changes unrelated to long-press latching (other than variable renames and style fixes -- which are appreciated! :) )