Fix the last bit of wonkiness with footprints, clean up code.