Resolve references in return value options