Pretty straightforward changes. This commit tries to avoid making any non-trivial fixes.