As we are in a stabilization phase for 5.3, I only made the minimal changes i.e. I haven't optimized the debug enabled statements.