Fix some more extras -> ~extras entries. This is kinda busted... scripts need cleaning.