Worked a bit more on the AOP/CodeGen stuff

Much cleaner/simpler with Roslyn compared to the IL gen code.