This commit is way too big

1. Got rid of the inverted expression forms
2. Changed arg,args to x,xs