short-circuiting: or - testing and minor changes; finished refactoring prefix expr integration