Arg, me trying to get rst's hyperlinking working correctly, and failing. Seems like you managed to get a decent solution.