I generally recommend your #1 suggestion as the best approach. Less error-prone that way.