Improved syntax for #21, improves on pull #22.