We'll almost certainly do that, but my usual M.O. is to merge the first time and extract the second. It prevents gooberish fixes like the ones to `vim-mode.less` where I got ahead of myself and merged broken CSS earlier today. No problem getting ahead of ourselves if @mcolyer agrees with you, though.