adds better conditional handling in fast-point