Fix split predefs specials stds

Merge into split-predefs-specials-stds and then push to make pr 198 work.