Minor improvements to SYCL utils and related clean-up