Thenable support is now on a flag

Also fixed some closure compiler annotations