Move stuff into the golang core