Move 'addFormContext' to form module, to reduce intermodule dependency.