Make effective genome size more consistent and use more macros. Fixes #38