Add comments, reduce dependencies on JCA classes.