As per previous commit, it is currently possible for client
configuration to specify both an annotation to focus and an additional
group to include.