reducing number of ifdefs relates #148
degradation check for #149 - it was not me!