Fix use of expected type of ignore expressions.
Remove duplicate top-filter empty case.