pacemaker: Support 2.0 schema
pacemaker: Clean up None-comparisons