Simplify nbf/exp handling a bit