Removed shadowing of generic type by inner class. Removed debugging information for always null value.