Tidied up some eval()ed code and removed a duplicate pattern match.