diff --git a/lib/rdoc/context.rb b/lib/rdoc/context.rb
index 22339bf1c7..e7674157ec 100644
--- a/lib/rdoc/context.rb
+++ b/lib/rdoc/context.rb
@@ -303,10 +303,11 @@ def add_class class_type, given_name, superclass = '::Object'
     end
 
     # fix up superclass
-    superclass = nil if full_name == 'BasicObject'
-    superclass = nil if full_name == 'Object' and defined?(::BasicObject)
-    superclass = '::BasicObject' if
-      defined?(::BasicObject) and full_name == 'Object'
+    if full_name == 'BasicObject' then
+      superclass = nil
+    elsif full_name == 'Object' then
+      superclass = defined?(::BasicObject) ? '::BasicObject' : nil
+    end
 
     # find the superclass full name
     if superclass then