In light of the BATF's recent ruling, would it make sense to keep a pistol buffer tube and pistol upper around if you're doing a lot of builds, and just build each receiver as a pistol, take a picture of it to establish the date, then rebuild it however you want it? Seems like that would keep your options open for the future.