oggopus: further cleanup in response to review.