More Apache 2.4 cleanups