Myrimatch modifications - fixing bugs.
Minor Idpicker bugs (did not pass in swift config).
Trivial fix (static method).