Remove instruction width assumptions to support RVC