Made the normal case of module/version handling faster at the cost of slightly slower error handling