Once again, I was violating YAGNI