You're right, `old` isn't necessary anymore (in fact, it wasn't used before this diff either). I'll push a version without it.