AC-8159. Fix a few more things with the new syntax.