r600: minor span cleanups