Added support for comment().  Fixes #495