Remove some level-4 warnings. Do some syntax editing.