Minor refactoring. Let's try this again with locally compiled classes for JProfiler...