Adjustments to fix drunken changes and simplify.