@rnk: I considered both, and am new to the codebase, so the 'correct' place to fix this wasn't apparent. Does anyone else have an opinion, here? Either way is effective, and pretty straightforward as well. http://reviews.llvm.org/D6145