Cleanups
Switch to the implementation if it's the first one we built