Rearranging code in hopes of avoiding errors and causing the behavior I want.