Rework GCoder a little bit to prepare future changes