A few fixes and style cleanups for graphite code.