Prefer correctness over excess bracketing
Add a TODO
Stop searching for function usages at new declarations