Ben,
I do agree with your first suggestion. As to suggestion #2 .....