Add comments, suggested by Simon Josefsson.