Fix merge conflict round 2.
Merge remote-tracking branch 'nokey/master'
Merge remote-tracking branch 'nokey/master'
Merge remote-tracking branch 'nokey/master'
Remove extra newlines
Don't return args if any arg is bad.