Added the ability to use procs rather than evaluated strings for notes and comments.