The OP gives many valid tweaks, I am in favor.