Implement Vismara relevant cycles
Simplify iterator macros