Minor fixes Based on William Rucklidge's review, including a nasty bug in parameter block removal. Change-Id: I3a692e589f600ff560ecae9fa85bb0b76063d403