npe fix
initial rework.

predefined symbols moved to bundled impl
typo
moved to new consulo build