Keyword naming collisions. More improvements as well.