Bring code in line with c code.