Changed how ``Raw`` inputs are handled. Thanks to kylemacfarlane for the (really good) report.