I agree - my change was motivated by minimalism - but I prefer your second approach and will make this change later today.