AC-7999. Continue refining the syntax.