correct a bug due to else binding to the wrong if with {};
add additional mov encodings.