ToC10/25: As I said, final commit *cough*