Minor fixes in code hint test/debug code to address review comments.