More input refactoring.
Oops more userlist/slats refactoring things I missed.