Re-do several things of r96798 in preparation of re-doing the rest (there's a bug...