FS: $handler replaced with method closure-factory