Clean up some deprecated moment calls.