Fixed issues pointed out by Erlend Nossum in https://github.com/amedia/regurgitator/pull/10