Make function matcher more restictive
Don't assume that the curly brace is on the same line as a function