Ok np. Also I notice a number of `if var is not None` and various other conditionals that could be cleaned up. Mind if I fix them?