Reduce the number of macros used for SignedExtensions

Signed-off-by: Serban Iorga <[email protected]>