Eliminate the instruction placeholder. Simplify a bunch of code.

This results in no significant speedup, but does provide simpler code

llvm-svn: 8980