A truly monstrous amount of cleanup...  The plugin format is significantly
streamlined now...