Replaced hacky inc functions with threading macros.