More cleanup for ident rules