Please re-instate all returns you removed, too. While they may seem unnecessary, we actually test many of these explicitly.