diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassEnhancer.java b/org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassEnhancer.java
index 5e2c985f65..93e4efdd75 100644
--- a/org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassEnhancer.java
+++ b/org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassEnhancer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2010 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,6 +30,8 @@ import net.sf.cglib.proxy.NoOp;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.aop.scope.ScopedProxyFactoryBean;
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.util.Assert;
@@ -83,7 +85,7 @@ class ConfigurationClassEnhancer {
 	 * container-aware callbacks capable of respecting scoping and other bean semantics.
 	 * @return fully-qualified name of the enhanced subclass
 	 */
-	public Class enhance(Class configClass) {
+	public Class<?> enhance(Class<?> configClass) {
 		if (logger.isDebugEnabled()) {
 			logger.debug("Enhancing " + configClass.getName());
 		}
@@ -123,6 +125,12 @@ class ConfigurationClassEnhancer {
 	}
 	
 	
+	/**
+	 * Intercepts calls to {@link FactoryBean#getObject()}, delegating to calling
+	 * {@link BeanFactory#getBean(String)} in order to respect caching / scoping.
+	 * @see BeanMethodInterceptor#intercept(Object, Method, Object[], MethodProxy)
+	 * @see BeanMethodInterceptor#enhanceFactoryBean(Class, String)
+	 */
 	private static class GetObjectMethodInterceptor implements MethodInterceptor {
 		
 		private final ConfigurableBeanFactory beanFactory;
@@ -134,7 +142,6 @@ class ConfigurationClassEnhancer {
 		}
 
 		public Object intercept(Object obj, Method method, Object[] args, MethodProxy proxy) throws Throwable {
-			System.out.println("intercepting request for getObject()");
 			return beanFactory.getBean(beanName);
 		}
 		
@@ -245,7 +252,6 @@ class ConfigurationClassEnhancer {
 			callbackInstances.add(NoOp.INSTANCE);
 			
 			List<Class<? extends Callback>> callbackTypes = new ArrayList<Class<? extends Callback>>();
-
 			for (Callback callback : callbackInstances) {
 				callbackTypes.add(callback.getClass());
 			}
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/Spr6602Tests.java b/org.springframework.context/src/test/java/org/springframework/context/annotation/Spr6602Tests.java
index a817b5e434..fa2c3a6b0e 100644
--- a/org.springframework.context/src/test/java/org/springframework/context/annotation/Spr6602Tests.java
+++ b/org.springframework.context/src/test/java/org/springframework/context/annotation/Spr6602Tests.java
@@ -1,13 +1,26 @@
+/*
+ * Copyright 2002-2010 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.springframework.context.annotation;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
-import org.springframework.aop.support.AopUtils;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;