A large collection of changes, which should have been committed sooner...