Further tidying of piquant.py.