Easy solution for re-assigning declarations

This now just creates a new Declaration in case the previous ones don't fit; this won't handle all the special cases in an optimal way, but should work for most sane code.