Fix a bug I introduced (assertion failed: Unknown operand type), and convert to predicate style for type checks

llvm-svn: 531