Even better support for Wrapper & Fallback Ads

You might wanna merge that back in master.