Minor cleanups in base.Logic
Minor cleanups in base.Logic

Patch by: Sverre Rabbelier

MatthewWilkes/mw4068-packaging,MatthewWilkes/mw4068-packaging,MatthewWilkes/mw4068-packaging,MatthewWilkes/mw4068-packaging