Give amalgamate.py options more descriptive names