Revert "Move present/blank to appropriate section"

This reverts commit 2bee9e8ac8dc4354cd54a578c74d7ff5f7b93353.
Revert "Use present? and blank? in conditionals"

This reverts commit 1541baa6cbccf0b9f2291fbe8091bda70e003ab3.

There is a lot of discussion still happening in #99 - it's clear that I
prematurely merged that pull request.