More tweaks to sphinx generation from markup.py