Area viewer: Minor restructurings