[s360] Cleanup in Zangarmarsh.cpp - one step closer to compatibility with R2