All of your shortcuts are great, but you really need to separate Section 1245 and Section 1250 assets in the return.
