DRY (fixes #6)