Some minor cleanup and renames.