If we did that, I could keep my changes to target.py, which would be nice because it simplifies export lookup at usage