Remove redundant clears

Also about to merge in some changes that improve the line
numbers(1b79a6258952905ce9d205c3e38256e9ddcbe203) and a bug fix that
makes PMB_InstanceBasedLocalThreads show up in Eclipse
(f0fead5dc649898ff82ef4084e007c7c263aafd5)