Small changes to the way we deal with input