Slight change in ordering of alignment
Slight change in ordering of alignment

Wanted to see if I could get better ordering with assignments and interaction with case/when.  Might have to revert this if it causes side effects.
Remillard/VHDL-Mode