Changed to new stdlib.
Various changes in that regard until tests passed.