Issue #228/#231: Clean up key comparison to None value