Massive cleanup

There was a lot of cruft left from getting this working.  This makes it
clear what all we're actually overriding in stock.