Simplify code even more, get rid of '_?_' hack