Just normalize, no more ifdef.