Some minor work towards #3