Could always lock out the D4 by loosening the tail cap slightly.

Plus if you want super compact get a 18350 tube