Ok, one step better is the built in context switching action helper. This will make my code much easier to work with (I miss this from Solar # 2010/09/05