Refactor argument cascade