Make constant autoloader-compatible
Remove unreachable code
Small cleanups