Various fixes for phan-taint-check