Both of these shouldn't be necessary, with the logic in commutator.py.