Cosmetic changes, forgot to remove -s from get_env when
MK_SUB is false.