Adjusted formats of macro values
Added code to emit macro definitions