Ive Dancer does the job for both of these without the mana cost. I could always try to fit in Immaculate Magistrate for another no mana target tap. Archetype of Endurance may need to be a sideboard card to combat against Hexproof decks.
Permalink