Some anal lining up of parameters, etc