Avoid hardcoding wrapper directory twice

That this requires a directory lookup may make this a dubious tradeoff.
Add TODOs