FIX: digging while raging (and code cleanup)

You could dig and thus move while raging. I made the code much cleaner
while fixing this (we had quadruple code duplication... my mistake, of
course).