Added delegate classes for 1.7.2's crazy classpath issues.