Update to match new role annotation syntax.
Trailing whitespaces
Follow changes in comparison primops (see #6135)