Classpath untracked. Spacing change made elsewhere to prevent a no
change error.
Small optimizations and tweaks