Redid arg/return handling (still not as I would like it to be, though).
1 file changed