I was going through a box of misc. parts yesterday and ran across a pcv pipe the perfectly fits a 18650. I was actually thinking of doing a switchless mod with it but I won't get to it until I finish my current mod and the one slated for next. I'd love to see yours and maybe it'll save me from screwing mine up when I get to it.
If you want to pm the pics I'll post em for you (or just get urself 15 posts!)