Be more strict about function/statement mismatches