MN10300: Clean up the misalignment handler a little