Try again to prettify the nullspace logic