Saving trvial tinkerings before Bjarni's great merge