Minor cleanup; converted ToBitmapImage helper to be async