Improve handling of simple inline comments 

Feel free to improve the quality of this code...