Feature: Allow for `return` in solutions

This is a revert of a revert.  The original message is below:

Revert "Revert "Allow for `return' in solutions""

This reverts commit ff628f81605bf73c777abee8f5c839455ec4bf08.