Harmonized definition.py and maker.py commands.