MOO-721 Refactor the gremlins to prevent race condition in parameter validation