Same question as on PR #2331 about storing defaults in `common.py`?