Issue 7596: Command line is broken on Nightly

https://code.google.com/p/fbug/issues/detail?id=7596
Issue 7610: Auto-completion broken for primitives

https://code.google.com/p/fbug/issues/detail?id=7610