Debugger: Remove some assumptions