This will no doubt break all the code, but makes things shorter and more idiomatic