A few more changes (via Jay's suggestion.)