Improved parameters handling and get rid of more macroses
Suppressed effc++ warning in reservable priority queue