Some minor restructurings.