Minor changes, for attempting to implement in js/src.