WIP: Workaround for #collect_options, updates messages.