[refactor] too many 'return' were changed to 'pure' too fast

This fixes commit 5d5300cd which
automatically changed all 'return' to 'pure' in our code, resulting in
broken SQL etc.