builtin-notes: Refactor handling of -F option to allow combining -m and -F