More updates to the ocomment class in our never-ending search for perfection.