Use parsed UnitOptions everywhere

This stuff is all just moved across right?