Re-repair maker.py, really usable now.