Yes, it's a minimal possible change for easy reviewing.  Various bits of code remain that don't provide any real benefit anymore, they can all be cleaned up between now and the exhaustion of the sun.