nostance Makro for Druid Shapeshifting

Hi,

i was using this makro before the patch:
/cast [nostance:5] Moonkin Form

It shifted me to my form if it was not active and did not remove the moonkin form. That way it was easy to press it several times so that every druid switched to form and not back. But it seems this is not working anymore. Any ideas how to fix it?

/cast [noform] Moonkin Form

or

/cast !Moonkin Form

The issue with the first is that it will count travel form as a form and not shift you immediately... the 2nd can be spammed but it could eat a couple of GCDs and waste a little mana as it will do a shift from Moonkin -> Moonkin but I find this much more helpful when clearing movement impairing effects instead of going Moonkin -> caster -> Moonkin.

I basically have the first in front of my castsequence macro to make sure I'm in form, and the 2nd shared with my totem drop button for my shams.

Works great thanks