Further parsification.
Merge branch 'master' of http://www.github.com/Propolandante/clarp_returns