Initial steps towards addressing #701