I might be jumping the gun here since you have already mentioned this one in the TODO. Is there a short-cut hacky way of doing this for now?