Give control blocks more precedence
Fix support.function matching on assignments