Revert "Slight clean up of ret code""

This reverts commit d41d921a7e7ba778c64a80f6fc8948d9612ffa49.
Revert "get_parameter should only return the first item if its a list"

This reverts commit 8ca7f8578f6056338d85fe340ba2876dba0d2be0.