More variable substitution and try to fix man2pod.