Integrating Philipp Gesang's changes into .dtx