agree with both points

separately, i'm starting to dislike the magic global state of `get_current_cloud`, but that's for a separate discussion