More simplification, remove ref to optional handler factory