Fix #72; extract validators into private methods