Backing up further progress on Input and InputFilter.