find_sing typechecks now...

Test Plan:
<see below>