Slight tweak to code, no functional diff.