Fix with_annotated decorator so using ArgumentBlock works with groups

Fix with_annotated decorator so using ArgumentBlock works with groups #1138