fix remaining go.syntax issues