Fix tools, bootstrap
Keep track of pending implicit instances