Inline defines, fixes #5