Small cleanup
Implement local find-uses