Add more LWC2/SWC2 instructions, fix alignment.