Work around guide-key breakage
Highlight todos in comments