Changed sun keycodes again to accommodate upstream convenience.