Actually process fallbacks properly by asset path instead of making assumptions

- Includes minor code style changes