simplify handling of anonymous entry blocks; fixes #948