Tidying up #defines