got rid of unneeded arguments to some inline functions