Less macros; standard number datatypes