Refactor: Flatten some forward-arrow-pattern ifs to vertical code