Copy NORMAL mode as PXEFBSD, and NORMALv1 as NORMALv2. Also caught some uncommitted table_regex changes.