Miscellaneous formatting and promisee changes.