Make RawFromSql less sketchy