Ultimately, though, both of those solutions are likely to be less optimal than the initial decorations. I can't imagine an architecture where (MOD 900) costs less than (+ 900).