Centralise more passport costs

More housekeeping to keep passport costs in one place.