bb#8333 - added Morgan's suggested change for consistency in signature definition macros
bb#8407 - fixed cases where compiler attempted to truncate values incorrectly