use new plugin wrapper macros for bookmarks plugin
tweak delauny code to be more strict on it's colinear detection