Simplify delimiting logic