Make Xcode 6 happy
Better behavior for re-presenting existing callout

Fixes #64