Simplify code by allowing nil as edit fn return value