Add context for "on" translation
Use a with clause to assign 'node' as 'comment' to facilitate future evolutions diff-based