eliminate now superfluous returns (require Go 1.1 to run this now)