Apache2 module code cleanups