ActionsParser refactor

I am not particularly happy about this. Do we at least know why it is not working? (so we can keep the track of this somewhere).