Updating forms source comments to also include flags