Some refactoring to get rid of args...