Small cleanup wrt naming conventions, small evaluation bug (implies was not defined).