Ok, I feel undecided :) Let's leave it then, maybe it proves useful as we add some option-specific functionality to it in the future.