Some cleanup for r209568.