[quote=@Holy Grail]
[@ConstantlyComic]

Wouldn't his second NP and such become accessible if he and his master turned off Mad Enhancement (though this would defeat the purpose of having ME boosts for him)? 
[/quote]

Yeah, I actually talked to the GM about that.  It could also be worked around with a Command Seal, like Kariya did in Fate/Zero.