* More private field -> #field adjustments * Work-around for set.add failures * Remove FIXME, it is done