Uniformize calling conventions