Generally prefer that a commit be self-contained. If and when you add these additional behaviors, that commit will naturally show this changing to a `j:choose`.