Tweaks to better handle roxygen comments, regular comments, $ completion