Yet another stack-of-changes.