Tweaked hole punching a bit.