Removed the previously introduced hack and replaced it with an elegant solution inheriting from NodeSeq.