gre: minor cleanups