#16245 receive builder could match generic messages, problem with scala ...

...type in CaseStatements class
I'm not sure these whitespace changes are all good