Switch to using a standard Promises/A+ implementation.
Normalize terminology and kill a debug print that slipped in