Introduce NEW_INT macro to reduce code duplication

Signed-off-by: Stefan Marr <git@stefan-marr.de>
Whitespace

Signed-off-by: Stefan Marr <git@stefan-marr.de>