Yeah, that'd be much clearer (rather than included magic), but still looks over-engineered to me, having two extra files just for two settings.  @ohadlevy?