Some refinements care of folks in ##java.