Fix OS X specific code in command_line.cc
Improve NOTES