Refactored a bit and added support for literal holes back in.