@shane-tomlinson, filed a separate issue for the DRYness issue: #868