remove some Groovy missing return statement false positives (IDEA-51930, IDEA-51932)