Intensive FileSystemAction refactoring (cont'd)