Closer to compiling on new inform. This commit is not compilable in old inform without adjustments(easy though they are).

Signed-off-by: David Silver <dms.silver@gmail.com>