Refactoring blocking/is_blocked handling to (properly) resolve promises. For real this time.