Refactoring input mixins to make api more consistent across various inpu...

...t types.