Fix code so that tests pass#972

joni-toivonen wants to merge 2 commits into

iloveponies:masteriloveponies/predicates:masterfrom

joni-toivonen:masterjoni-toivonen/predicates:masterCopy head branch name to clipboard