Some smaller clean-ups to help in debugging.