Actually tested what I just committed.  Option 3 works fine now.