Paving the way for very exciting stuff for reaccumulating precipitation. For...

Paving the way for very exciting stuff for reaccumulating precipitation. For now, major code cleanup and simplification. Watch out, there might be cases where this does not work anymore!