Improved handling of time-only pairs. Closes #18