Removed some branches; maybe it will compile faster.