Fixes to 41a5586, per review.