Make handle code simpler.